Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 9 Apr 2012 06:54:40 +0000 (23:54 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 9 Apr 2012 06:54:40 +0000 (23:54 -0700)
commit86c423e7920b373f5fbeebfabb24a8a9c412fe61
tree3d726072ef276980a96abc67f220ff6835aa84ea
parent672d8712206d634ab50646f61fb5168a7da9a756
parent4d7183d107c551a50101e47d699f21c6b9f7d8dc
Merge from trunk.